Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Nov 2011 02:24:15 +0000 (19:24 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Nov 2011 02:24:15 +0000 (19:24 -0700)
commitece6dc347dc7e37fb1c74227b1eda232f92bb07f
treed01aaa03bd814404fd2d4edde5e2a99f054ecf79
parentfe1e053a84cb406062cade03d4e67417b36a5ec2
parent84f958efe975556a11e523291b3fb4fc5bbe90a6
Merge from trunk.